From 05626ec3939ba7cef4b2c01d0e0e5623ef7facf0 Mon Sep 17 00:00:00 2001 From: "sos22@douglas.cl.cam.ac.uk" Date: Fri, 19 Aug 2005 14:10:24 +0000 Subject: [PATCH] Unbreak the build in the non-CONFIG_SMP and x86_64 cases. Signed-off-by: Steven Smith, sos22@cam.ac.uk --- linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c | 7 +++++++ linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c | 6 ++++++ linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c | 6 ++++++ 3 files changed, 19 insertions(+) diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c index 12a47fb4e3..88004e76bd 100644 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c @@ -790,3 +790,10 @@ unsigned long arch_align_stack(unsigned long sp) sp -= get_random_int() % 8192; return sp & ~0xf; } + + +#ifndef CONFIG_X86_SMP +void _restore_vcpu(void) +{ +} +#endif diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c index d1a7acefaa..9aae8ef74a 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c @@ -743,3 +743,9 @@ unsigned long arch_align_stack(unsigned long sp) sp -= get_random_int() % 8192; return sp & ~0xf; } + +#ifndef CONFIG_SMP +void _restore_vcpu(void) +{ +} +#endif diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c index b8cf136caf..c4247881a7 100644 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c @@ -1286,4 +1286,10 @@ void smp_resume(void) smp_intr_init(); local_setup_timer_irq(); } + +void _restore_vcpu(void) +{ + /* XXX need to write this */ +} + #endif -- 2.30.2